Merge from emacs-24 branch; up to r108082
authorChong Yidong <cyd@gnu.org>
Sat, 28 Jul 2012 15:12:37 +0000 (23:12 +0800)
committerChong Yidong <cyd@gnu.org>
Sat, 28 Jul 2012 15:12:37 +0000 (23:12 +0800)

Trivial merge